Remove excessive g_return_if_fail() checks in static functions.

2005-12-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkliststore.c:
	* gtk/gtktreestore.c: Remove excessive g_return_if_fail() checks
	in static functions.

diff --git a/ChangeLog b/ChangeLog
index f3e10223a7b724fa63aa023bcd64024af7b30f9d..1e606f4ee060af46ce652490aca9eeeea4bd3ae5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2005-12-29  Matthias Clasen  <mclasen@redhat.com>
 
-       * gtk/gtktreedatalist.c: Use the slice allocater for 
-       GtkTreeDataSortHeader.
+       * gtk/gtkliststore.c: 
+       * gtk/gtktreestore.c: Remove excessive g_return_if_fail() checks
+       in static functions.
+
+       * gtk/gtktreedatalist.c: Use the slice allocater for GtkTreeDataSortHeader.
 
        * gtk/gtktreedatalist.h: 
        * gtk/gtktreedatalist.c (_gtk_tree_data_list_set_header): New function.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f3e10223a7b724fa63aa023bcd64024af7b30f9d..1e606f4ee060af46ce652490aca9eeeea4bd3ae5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,10 @@
 2005-12-29  Matthias Clasen  <mclasen@redhat.com>
 
-       * gtk/gtktreedatalist.c: Use the slice allocater for 
-       GtkTreeDataSortHeader.
+       * gtk/gtkliststore.c: 
+       * gtk/gtktreestore.c: Remove excessive g_return_if_fail() checks
+       in static functions.
+
+       * gtk/gtktreedatalist.c: Use the slice allocater for GtkTreeDataSortHeader.
 
        * gtk/gtktreedatalist.h: 
        * gtk/gtktreedatalist.c (_gtk_tree_data_list_set_header): New function.

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 43a6bc7142a6bf6059a9f73a16b39e2c998e3a18..bfc55a7b87d4b7630a1103c0c1b5a01934378e73 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -28,7 +28,7 @@
 #include "gtkintl.h"
 #include "gtkalias.h"
 
-#define GTK_LIST_STORE_IS_SORTED(list) (GTK_LIST_STORE (list)->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
+#define GTK_LIST_STORE_IS_SORTED(list) (((GtkListStore*)(list))->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
 #define VALID_ITER(iter, list_store) ((iter)!= NULL && (iter)->user_data != NULL && list_store->stamp == (iter)->stamp && !_gtk_sequence_ptr_is_end ((iter)->user_data) && _gtk_sequence_ptr_get_sequence ((iter)->user_data) == list_store->seq)
 
 static void         gtk_list_store_init            (GtkListStore      *list_store);
@@ -377,9 +377,6 @@ gtk_list_store_set_n_columns (GtkListStore *list_store,
 {
   GType *new_columns;
 
-  g_return_if_fail (GTK_IS_LIST_STORE (list_store));
-  g_return_if_fail (n_columns > 0);
-
   if (list_store->n_columns == n_columns)
     return;
 
@@ -409,9 +406,6 @@ gtk_list_store_set_column_type (GtkListStore *list_store,
                                gint          column,
                                GType         type)
 {
-  g_return_if_fail (GTK_IS_LIST_STORE (list_store));
-  g_return_if_fail (column >=0 && column < list_store->n_columns);
-
   if (!_gtk_tree_data_list_check_type (type))
     {
       g_warning ("%s: Invalid type %s passed to gtk_list_store_set_column_type\n", G_STRLOC, g_type_name (type));
@@ -451,8 +445,6 @@ gtk_list_store_finalize (GObject *object)
 static GtkTreeModelFlags
 gtk_list_store_get_flags (GtkTreeModel *tree_model)
 {
-  g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), 0);
-
   return GTK_TREE_MODEL_ITERS_PERSIST | GTK_TREE_MODEL_LIST_ONLY;
 }
 
@@ -461,8 +453,6 @@ gtk_list_store_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkListStore *list_store = (GtkListStore *) tree_model;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), 0);
-
   list_store->columns_dirty = TRUE;
 
   return list_store->n_columns;
@@ -474,9 +464,8 @@ gtk_list_store_get_column_type (GtkTreeModel *tree_model,
 {
   GtkListStore *list_store = (GtkListStore *) tree_model;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), G_TYPE_INVALID);
-  g_return_val_if_fail (index < GTK_LIST_STORE (tree_model)->n_columns &&
-                       index >= 0, G_TYPE_INVALID);
+  g_return_val_if_fail (index < GTK_LIST_STORE (tree_model)->n_columns, 
+                       G_TYPE_INVALID);
 
   list_store->columns_dirty = TRUE;
 
@@ -492,9 +481,6 @@ gtk_list_store_get_iter (GtkTreeModel *tree_model,
   GtkSequence *seq;
   gint i;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), FALSE);
-  g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
   list_store->columns_dirty = TRUE;
 
   seq = list_store->seq;
@@ -516,7 +502,6 @@ gtk_list_store_get_path (GtkTreeModel *tree_model,
 {
   GtkTreePath *path;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), NULL);
   g_return_val_if_fail (iter->stamp == GTK_LIST_STORE (tree_model)->stamp, NULL);
 
   if (_gtk_sequence_ptr_is_end (iter->user_data))
@@ -534,13 +519,12 @@ gtk_list_store_get_value (GtkTreeModel *tree_model,
                          gint          column,
                          GValue       *value)
 {
+  GtkListStore *list_store = (GtkListStore *) tree_model;
   GtkTreeDataList *list;
   gint tmp_column = column;
 
-  g_return_if_fail (GTK_IS_LIST_STORE (tree_model));
-  g_return_if_fail (column < GTK_LIST_STORE (tree_model)->n_columns);
-  g_return_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp);
-  g_return_if_fail (VALID_ITER (iter, GTK_LIST_STORE(tree_model)));
+  g_return_if_fail (column < list_store->n_columns);
+  g_return_if_fail (VALID_ITER (iter, list_store));
                    
   list = _gtk_sequence_ptr_get_data (iter->user_data);
 
@@ -548,10 +532,10 @@ gtk_list_store_get_value (GtkTreeModel *tree_model,
     list = list->next;
 
   if (list == NULL)
-    g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]);
+    g_value_init (value, list_store->column_headers[column]);
   else
     _gtk_tree_data_list_node_to_value (list,
-                                      GTK_LIST_STORE (tree_model)->column_headers[column],
+                                      list_store->column_headers[column],
                                       value);
 }
 
@@ -559,7 +543,6 @@ static gboolean
 gtk_list_store_iter_next (GtkTreeModel  *tree_model,
                          GtkTreeIter   *iter)
 {
-  g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), FALSE);
   g_return_val_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp, FALSE);
   iter->user_data = _gtk_sequence_ptr_next (iter->user_data);
 
@@ -571,14 +554,12 @@ gtk_list_store_iter_children (GtkTreeModel *tree_model,
                              GtkTreeIter  *iter,
                              GtkTreeIter  *parent)
 {
-  GtkListStore *list_store;
+  GtkListStore *list_store = (GtkListStore *) tree_model;
   
   /* this is a list, nodes have no children */
   if (parent)
     return FALSE;
 
-  list_store = GTK_LIST_STORE (tree_model);
-
   if (_gtk_sequence_get_length (list_store->seq) > 0)
     {
       iter->stamp = list_store->stamp;
@@ -600,16 +581,13 @@ static gint
 gtk_list_store_iter_n_children (GtkTreeModel *tree_model,
                                GtkTreeIter  *iter)
 {
-  GtkListStore *store;
-
-  g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), -1);
+  GtkListStore *list_store = (GtkListStore *) tree_model;
 
-  store = GTK_LIST_STORE (tree_model);
-  
   if (iter == NULL)
-    return _gtk_sequence_get_length (store->seq);
+    return _gtk_sequence_get_length (list_store->seq);
+
+  g_return_val_if_fail (list_store->stamp == iter->stamp, -1);
 
-  g_return_val_if_fail (store->stamp == iter->stamp, -1);
   return 0;
 }
 
@@ -619,23 +597,20 @@ gtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
                               GtkTreeIter  *parent,
                               gint          n)
 {
+  GtkListStore *list_store = (GtkListStore *) tree_model;
   GtkSequencePtr child;
-  GtkListStore *store;
-
-  g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), FALSE);
 
-  store = GTK_LIST_STORE (tree_model);
-  
   if (parent)
     return FALSE;
 
-  child = _gtk_sequence_get_ptr_at_pos (store->seq, n);
+  child = _gtk_sequence_get_ptr_at_pos (list_store->seq, n);
 
   if (_gtk_sequence_ptr_is_end (child))
     return FALSE;
 
-  iter->stamp = store->stamp;
+  iter->stamp = list_store->stamp;
   iter->user_data = child;
+
   return TRUE;
 }
 
@@ -661,11 +636,6 @@ gtk_list_store_real_set_value (GtkListStore *list_store,
   gboolean converted = FALSE;
   gboolean retval = FALSE;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
-  g_return_val_if_fail (VALID_ITER (iter, list_store), FALSE);
-  g_return_val_if_fail (column >= 0 && column < list_store->n_columns, FALSE);
-  g_return_val_if_fail (G_IS_VALUE (value), FALSE);
-
   if (! g_type_is_a (G_VALUE_TYPE (value), list_store->column_headers[column]))
     {
       if (! (g_value_type_compatible (G_VALUE_TYPE (value), list_store->column_headers[column]) &&
@@ -913,10 +883,6 @@ gtk_list_store_set (GtkListStore *list_store,
 {
   va_list var_args;
 
-  g_return_if_fail (GTK_IS_LIST_STORE (list_store));
-  g_return_if_fail (iter != NULL);
-  g_return_if_fail (iter->stamp == list_store->stamp);
-
   va_start (var_args, iter);
   gtk_list_store_set_valist (list_store, iter, var_args);
   va_end (var_args);
@@ -1198,7 +1164,6 @@ gtk_list_store_drag_data_delete (GtkTreeDragSource *drag_source,
                                  GtkTreePath       *path)
 {
   GtkTreeIter iter;
-  g_return_val_if_fail (GTK_IS_LIST_STORE (drag_source), FALSE);
 
   if (gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source),
                                &iter,
@@ -1215,8 +1180,6 @@ gtk_list_store_drag_data_get (GtkTreeDragSource *drag_source,
                               GtkTreePath       *path,
                               GtkSelectionData  *selection_data)
 {
-  g_return_val_if_fail (GTK_IS_LIST_STORE (drag_source), FALSE);
-
   /* Note that we don't need to handle the GTK_TREE_MODEL_ROW
    * target, because the default handler does it for us, but
    * we do anyway for the convenience of someone maybe overriding the
@@ -1248,8 +1211,6 @@ gtk_list_store_drag_data_received (GtkTreeDragDest   *drag_dest,
   GtkTreePath *src_path = NULL;
   gboolean retval = FALSE;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (drag_dest), FALSE);
-
   tree_model = GTK_TREE_MODEL (drag_dest);
   list_store = GTK_LIST_STORE (drag_dest);
 
@@ -1358,8 +1319,6 @@ gtk_list_store_row_drop_possible (GtkTreeDragDest  *drag_dest,
   GtkTreePath *src_path = NULL;
   gboolean retval = FALSE;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (drag_dest), FALSE);
-
   /* don't accept drops if the list has been sorted */
   if (GTK_LIST_STORE_IS_SORTED (drag_dest))
     return FALSE;
@@ -1768,8 +1727,6 @@ gtk_list_store_get_sort_column_id (GtkTreeSortable  *sortable,
 {
   GtkListStore *list_store = (GtkListStore *) sortable;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (sortable), FALSE);
-
   if (sort_column_id)
     * sort_column_id = list_store->sort_column_id;
   if (order)
@@ -1789,8 +1746,6 @@ gtk_list_store_set_sort_column_id (GtkTreeSortable  *sortable,
 {
   GtkListStore *list_store = (GtkListStore *) sortable;
 
-  g_return_if_fail (GTK_IS_LIST_STORE (sortable));
-
   if ((list_store->sort_column_id == sort_column_id) &&
       (list_store->order == order))
     return;
@@ -1831,11 +1786,6 @@ gtk_list_store_set_sort_func (GtkTreeSortable        *sortable,
                              GtkDestroyNotify        destroy)
 {
   GtkListStore *list_store = (GtkListStore *) sortable;
-  GtkTreeDataSortHeader *header = NULL;
-  GList *list;
-
-  g_return_if_fail (GTK_IS_LIST_STORE (sortable));
-  g_return_if_fail (func != NULL);
 
   list_store->sort_list = _gtk_tree_data_list_set_header (list_store->sort_list, 
                                                          sort_column_id, 
@@ -1853,8 +1803,6 @@ gtk_list_store_set_default_sort_func (GtkTreeSortable        *sortable,
 {
   GtkListStore *list_store = (GtkListStore *) sortable;
 
-  g_return_if_fail (GTK_IS_LIST_STORE (sortable));
-
   if (list_store->default_sort_destroy)
     {
       GtkDestroyNotify d = list_store->default_sort_destroy;
@@ -1876,8 +1824,6 @@ gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
 {
   GtkListStore *list_store = (GtkListStore *) sortable;
 
-  g_return_val_if_fail (GTK_IS_LIST_STORE (sortable), FALSE);
-
   return (list_store->default_sort_func != NULL);
 }
 

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 1569fc273e3081b79d633dbe4b83f170b83578fc..134096349f7997e11add46c78759f57a212ca379 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -28,8 +28,8 @@
 #include "gtkalias.h"
 
 #define G_NODE(node) ((GNode *)node)
-#define GTK_TREE_STORE_IS_SORTED(tree) (GTK_TREE_STORE (tree)->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
-#define VALID_ITER(iter, tree_store) (iter!= NULL && iter->user_data != NULL && tree_store->stamp == iter->stamp)
+#define GTK_TREE_STORE_IS_SORTED(tree) (((GtkTreeStore*)(tree))->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
+#define VALID_ITER(iter, tree_store) ((iter)!= NULL && (iter)->user_data != NULL && ((GtkTreeStore*)(tree_store))->stamp == (iter)->stamp)
 
 static void         gtk_tree_store_init            (GtkTreeStore      *tree_store);
 static void         gtk_tree_store_class_init      (GtkTreeStoreClass *tree_store_class);
@@ -399,8 +399,6 @@ gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
 {
   GType *new_columns;
 
-  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
-
   if (tree_store->n_columns == n_columns)
     return;
 
@@ -442,8 +440,6 @@ gtk_tree_store_set_column_type (GtkTreeStore *tree_store,
                                gint          column,
                                GType         type)
 {
-  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
-  g_return_if_fail (column >=0 && column < tree_store->n_columns);
   if (!_gtk_tree_data_list_check_type (type))
     {
       g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (type));
@@ -496,8 +492,6 @@ gtk_tree_store_finalize (GObject *object)
 static GtkTreeModelFlags
 gtk_tree_store_get_flags (GtkTreeModel *tree_model)
 {
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
-
   return GTK_TREE_MODEL_ITERS_PERSIST;
 }
 
@@ -506,8 +500,6 @@ gtk_tree_store_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
-
   tree_store->columns_dirty = TRUE;
 
   return tree_store->n_columns;
@@ -519,9 +511,7 @@ gtk_tree_store_get_column_type (GtkTreeModel *tree_model,
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), G_TYPE_INVALID);
-  g_return_val_if_fail (index < GTK_TREE_STORE (tree_model)->n_columns &&
-                       index >= 0, G_TYPE_INVALID);
+  g_return_val_if_fail (index < tree_store->n_columns, G_TYPE_INVALID);
 
   tree_store->columns_dirty = TRUE;
 
@@ -538,8 +528,6 @@ gtk_tree_store_get_iter (GtkTreeModel *tree_model,
   gint *indices;
   gint depth, i;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
-
   tree_store->columns_dirty = TRUE;
 
   indices = gtk_tree_path_get_indices (path);
@@ -567,26 +555,25 @@ static GtkTreePath *
 gtk_tree_store_get_path (GtkTreeModel *tree_model,
                         GtkTreeIter  *iter)
 {
+  GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GtkTreePath *retval;
   GNode *tmp_node;
   gint i = 0;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), NULL);
-  g_return_val_if_fail (iter != NULL, NULL);
   g_return_val_if_fail (iter->user_data != NULL, NULL);
-  g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp, NULL);
+  g_return_val_if_fail (iter->stamp == tree_store->stamp, NULL);
 
-  validate_tree ((GtkTreeStore*)tree_model);
+  validate_tree (tree_store);
 
   if (G_NODE (iter->user_data)->parent == NULL &&
-      G_NODE (iter->user_data) == GTK_TREE_STORE (tree_model)->root)
+      G_NODE (iter->user_data) == tree_store->root)
     return gtk_tree_path_new ();
   g_assert (G_NODE (iter->user_data)->parent != NULL);
 
-  if (G_NODE (iter->user_data)->parent == G_NODE (GTK_TREE_STORE (tree_model)->root))
+  if (G_NODE (iter->user_data)->parent == G_NODE (tree_store->root))
     {
       retval = gtk_tree_path_new ();
-      tmp_node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;
+      tmp_node = G_NODE (tree_store->root)->children;
     }
   else
     {
@@ -635,13 +622,12 @@ gtk_tree_store_get_value (GtkTreeModel *tree_model,
                          gint          column,
                          GValue       *value)
 {
+  GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GtkTreeDataList *list;
   gint tmp_column = column;
 
-  g_return_if_fail (GTK_IS_TREE_STORE (tree_model));
-  g_return_if_fail (iter != NULL);
-  g_return_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp);
-  g_return_if_fail (column < GTK_TREE_STORE (tree_model)->n_columns);
+  g_return_if_fail (column < tree_store->n_columns);
+  g_return_if_fail (VALID_ITER (iter, tree_store));
 
   list = G_NODE (iter->user_data)->data;
 
@@ -651,13 +637,13 @@ gtk_tree_store_get_value (GtkTreeModel *tree_model,
   if (list)
     {
       _gtk_tree_data_list_node_to_value (list,
-                                        GTK_TREE_STORE (tree_model)->column_headers[column],
+                                        tree_store->column_headers[column],
                                         value);
     }
   else
     {
       /* We want to return an initialized but empty (default) value */
-      g_value_init (value, GTK_TREE_STORE (tree_model)->column_headers[column]);
+      g_value_init (value, tree_store->column_headers[column]);
     }
 }
 
@@ -665,7 +651,6 @@ static gboolean
 gtk_tree_store_iter_next (GtkTreeModel  *tree_model,
                          GtkTreeIter   *iter)
 {
-  g_return_val_if_fail (iter != NULL, FALSE);
   g_return_val_if_fail (iter->user_data != NULL, FALSE);
   g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
 
@@ -683,19 +668,20 @@ gtk_tree_store_iter_children (GtkTreeModel *tree_model,
                              GtkTreeIter  *iter,
                              GtkTreeIter  *parent)
 {
+  GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GNode *children;
 
-  g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
-  g_return_val_if_fail (parent == NULL || parent->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
+  if (parent)
+    g_return_val_if_fail (VALID_ITER (parent, tree_store), FALSE);
 
   if (parent)
     children = G_NODE (parent->user_data)->children;
   else
-    children = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;
+    children = G_NODE (tree_store->root)->children;
 
   if (children)
     {
-      iter->stamp = GTK_TREE_STORE (tree_model)->stamp;
+      iter->stamp = tree_store->stamp;
       iter->user_data = children;
       return TRUE;
     }
@@ -707,9 +693,8 @@ static gboolean
 gtk_tree_store_iter_has_child (GtkTreeModel *tree_model,
                               GtkTreeIter  *iter)
 {
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
-  g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
   g_return_val_if_fail (iter->user_data != NULL, FALSE);
+  g_return_val_if_fail (VALID_ITER (iter, tree_model), FALSE);
 
   return G_NODE (iter->user_data)->children != NULL;
 }
@@ -721,7 +706,6 @@ gtk_tree_store_iter_n_children (GtkTreeModel *tree_model,
   GNode *node;
   gint i = 0;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
   g_return_val_if_fail (iter == NULL || iter->user_data != NULL, 0);
 
   if (iter == NULL)
@@ -744,14 +728,14 @@ gtk_tree_store_iter_nth_child (GtkTreeModel *tree_model,
                               GtkTreeIter  *parent,
                               gint          n)
 {
+  GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GNode *parent_node;
   GNode *child;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
   g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
 
   if (parent == NULL)
-    parent_node = GTK_TREE_STORE (tree_model)->root;
+    parent_node = tree_store->root;
   else
     parent_node = parent->user_data;
 
@@ -760,7 +744,7 @@ gtk_tree_store_iter_nth_child (GtkTreeModel *tree_model,
   if (child)
     {
       iter->user_data = child;
-      iter->stamp = GTK_TREE_STORE (tree_model)->stamp;
+      iter->stamp = tree_store->stamp;
       return TRUE;
     }
   else
@@ -772,21 +756,20 @@ gtk_tree_store_iter_parent (GtkTreeModel *tree_model,
                            GtkTreeIter  *iter,
                            GtkTreeIter  *child)
 {
+  GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GNode *parent;
 
   g_return_val_if_fail (iter != NULL, FALSE);
-  g_return_val_if_fail (child != NULL, FALSE);
-  g_return_val_if_fail (child->user_data != NULL, FALSE);
-  g_return_val_if_fail (child->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
+  g_return_val_if_fail (VALID_ITER (child, tree_store), FALSE);
 
   parent = G_NODE (child->user_data)->parent;
 
   g_assert (parent != NULL);
 
-  if (parent != GTK_TREE_STORE (tree_model)->root)
+  if (parent != tree_store->root)
     {
       iter->user_data = parent;
-      iter->stamp = GTK_TREE_STORE (tree_model)->stamp;
+      iter->stamp = tree_store->stamp;
       return TRUE;
     }
   else
@@ -809,11 +792,6 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
   gboolean converted = FALSE;
   gboolean retval = FALSE;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
-  g_return_val_if_fail (VALID_ITER (iter, tree_store), FALSE);
-  g_return_val_if_fail (column >= 0 && column < tree_store->n_columns, FALSE);
-  g_return_val_if_fail (G_IS_VALUE (value), FALSE);
-
   if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column]))
     {
       if (! (g_value_type_compatible (G_VALUE_TYPE (value), tree_store->column_headers[column]) &&
@@ -1044,9 +1022,6 @@ gtk_tree_store_set (GtkTreeStore *tree_store,
 {
   va_list var_args;
 
-  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
-  g_return_if_fail (VALID_ITER (iter, tree_store));
-
   va_start (var_args, iter);
   gtk_tree_store_set_valist (tree_store, iter, var_args);
   va_end (var_args);
@@ -1257,7 +1232,7 @@ gtk_tree_store_insert_before (GtkTreeStore *tree_store,
 
   gtk_tree_path_free (path);
 
-  validate_tree ((GtkTreeStore*)tree_store);
+  validate_tree (tree_store);
 }
 
 /**
@@ -1338,7 +1313,7 @@ gtk_tree_store_insert_after (GtkTreeStore *tree_store,
 
   gtk_tree_path_free (path);
 
-  validate_tree ((GtkTreeStore*)tree_store);
+  validate_tree (tree_store);
 }
 
 /**
@@ -1396,7 +1371,7 @@ gtk_tree_store_prepend (GtkTreeStore *tree_store,
       gtk_tree_store_insert_after (tree_store, iter, parent, NULL);
     }
 
-  validate_tree ((GtkTreeStore*)tree_store);
+  validate_tree (tree_store);
 }
 
 /**
@@ -1420,7 +1395,6 @@ gtk_tree_store_append (GtkTreeStore *tree_store,
 
   g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
   g_return_if_fail (iter != NULL);
-
   if (parent != NULL)
     g_return_if_fail (VALID_ITER (parent, tree_store));
 
@@ -1455,7 +1429,7 @@ gtk_tree_store_append (GtkTreeStore *tree_store,
       gtk_tree_store_insert_before (tree_store, iter, parent, NULL);
     }
 
-  validate_tree ((GtkTreeStore*)tree_store);
+  validate_tree (tree_store);
 }
 
 /**
@@ -1505,7 +1479,7 @@ gtk_tree_store_iter_depth (GtkTreeStore *tree_store,
 
 /* simple ripoff from g_node_traverse_post_order */
 static gboolean
-gtk_tree_store_clear_traverse (GNode *node,
+gtk_tree_store_clear_traverse (GNode        *node,
                               GtkTreeStore *store)
 {
   GtkTreeIter iter;
@@ -1635,8 +1609,6 @@ gtk_tree_store_drag_data_delete (GtkTreeDragSource *drag_source,
 {
   GtkTreeIter iter;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (drag_source), FALSE);
-
   if (gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source),
                                &iter,
                                path))
@@ -1656,8 +1628,6 @@ gtk_tree_store_drag_data_get (GtkTreeDragSource *drag_source,
                               GtkTreePath       *path,
                               GtkSelectionData  *selection_data)
 {
-  g_return_val_if_fail (GTK_IS_TREE_STORE (drag_source), FALSE);
-
   /* Note that we don't need to handle the GTK_TREE_MODEL_ROW
    * target, because the default handler does it for us, but
    * we do anyway for the convenience of someone maybe overriding the
@@ -1759,8 +1729,6 @@ gtk_tree_store_drag_data_received (GtkTreeDragDest   *drag_dest,
   GtkTreePath *src_path = NULL;
   gboolean retval = FALSE;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (drag_dest), FALSE);
-
   tree_model = GTK_TREE_MODEL (drag_dest);
   tree_store = GTK_TREE_STORE (drag_dest);
 
@@ -1868,8 +1836,6 @@ gtk_tree_store_row_drop_possible (GtkTreeDragDest  *drag_dest,
   GtkTreePath *tmp = NULL;
   gboolean retval = FALSE;
   
-  g_return_val_if_fail (GTK_IS_TREE_STORE (drag_dest), FALSE);
-
   /* don't accept drops if the tree has been sorted */
   if (GTK_TREE_STORE_IS_SORTED (drag_dest))
     return FALSE;
@@ -2886,8 +2852,6 @@ gtk_tree_store_get_sort_column_id (GtkTreeSortable  *sortable,
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE);
-
   if (sort_column_id)
     * sort_column_id = tree_store->sort_column_id;
   if (order)
@@ -2907,8 +2871,6 @@ gtk_tree_store_set_sort_column_id (GtkTreeSortable  *sortable,
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
 
-  g_return_if_fail (GTK_IS_TREE_STORE (sortable));
-
   
   if ((tree_store->sort_column_id == sort_column_id) &&
       (tree_store->order == order))
@@ -2950,9 +2912,6 @@ gtk_tree_store_set_sort_func (GtkTreeSortable        *sortable,
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
 
-  g_return_if_fail (GTK_IS_TREE_STORE (sortable));
-  g_return_if_fail (func != NULL);
-
   tree_store->sort_list = _gtk_tree_data_list_set_header (tree_store->sort_list, 
                                                          sort_column_id, 
                                                          func, data, destroy);
@@ -2969,8 +2928,6 @@ gtk_tree_store_set_default_sort_func (GtkTreeSortable        *sortable,
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
 
-  g_return_if_fail (GTK_IS_TREE_STORE (sortable));
-
   if (tree_store->default_sort_destroy)
     {
       GtkDestroyNotify d = tree_store->default_sort_destroy;
@@ -2992,8 +2949,6 @@ gtk_tree_store_has_default_sort_func (GtkTreeSortable *sortable)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
 
-  g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE);
-
   return (tree_store->default_sort_func != NULL);
 }